Adwaita: column header dnd style.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=731663

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 830ca3e197ea5509cfde4e095a64a5e0511682c7..73a391f6b4c9e6aed514669f9708a026826ef8c5 100644 (file)
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -815,10 +815,15 @@ column-header {
       @extend %column_header_button;
       color: mix($_column_header_color,$fg_color,50%);
       box-shadow: none;
+      transition: none; //I shouldn't need this
     }
     &:active {
       @extend %column_header_button;
       color: $fg_color;
+      transition: none; //I shouldn't need this
+    }
+    &.dnd {
+      @extend column-header.button.dnd;
     }
   }
   &:last-child .button,
@@ -827,6 +832,17 @@ column-header {
   }
 }
 
+column-header.button.dnd { // for treeview-like derive widgets
+  transition: none;
+  color: $selected_bg_color;
+  box-shadow: inset 1px 1px 0 1px $selected_bg_color,
+              inset -1px 0 0 1px $selected_bg_color,
+              inset 1px 1px $base_color, inset -1px 0 $base_color;;
+  &:active { @extend column-header.button.dnd; }
+  &:selected { @extend column-header.button.dnd; }
+  &:hover { @extend column-header.button.dnd; }
+}
+
 %column_header_button {
   border-width: 0 1px 1px 0;
   border-radius: 0;

diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 56622c694a724fccd7fb56d5d08959330a3bf97d..bc3ccbda2fd5c46d30638426f41954222c941584 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1007,12 +1007,19 @@ column-header .button {
   box-shadow: none; }
   column-header .button:hover {
     color: #bcbcbb;
-    box-shadow: none; }
+    box-shadow: none;
+    transition: none; }
   column-header .button:active {
-    color: #eeeeec; }
+    color: #eeeeec;
+    transition: none; }
 column-header:last-child .button, column-header:last-child.button {
   border-right-style: none; }
 
+column-header.button.dnd, column-header .button.dnd, column-header.button.dnd:active, column-header.button.dnd:selected, column-header.button.dnd:hover {
+  transition: none;
+  color: #215d9c;
+  box-shadow: inset 1px 1px 0 1px #215d9c, inset -1px 0 0 1px #215d9c, inset 1px 1px #292929, inset -1px 0 #292929; }
+
 column-header .button, column-header .button:hover, column-header .button:active {
   border-width: 0 1px 1px 0;
   border-radius: 0;

diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 960e5317a340640250c89cb6a599fb4d2a1b0d1d..f872cbe7868da5add7661344e3d3f240a3d9754a 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -999,12 +999,19 @@ column-header .button {
   box-shadow: none; }
   column-header .button:hover {
     color: #626668;
-    box-shadow: none; }
+    box-shadow: none;
+    transition: none; }
   column-header .button:active {
-    color: #2e3436; }
+    color: #2e3436;
+    transition: none; }
 column-header:last-child .button, column-header:last-child.button {
   border-right-style: none; }
 
+column-header.button.dnd, column-header .button.dnd, column-header.button.dnd:active, column-header.button.dnd:selected, column-header.button.dnd:hover {
+  transition: none;
+  color: #4a90d9;
+  box-shadow: inset 1px 1px 0 1px #4a90d9, inset -1px 0 0 1px #4a90d9, inset 1px 1px white, inset -1px 0 white; }
+
 column-header .button, column-header .button:hover, column-header .button:active {
   border-width: 0 1px 1px 0;
   border-radius: 0;